From: Paulo Zanoni Date: Fri, 4 May 2012 20:18:18 +0000 (-0300) Subject: drm/i915: start writing infoframes at address 0 on gen 4 X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~11095^2~25^2~54 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1d4f85ac2d5ef1892deba2a3df8a5695645418c8;p=linux-4.9.git drm/i915: start writing infoframes at address 0 on gen 4 Make sure we're doing the right thing, just like we do on gen5+. Signed-off-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index b84d19d0eaed..af88313d72d0 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -132,7 +132,7 @@ static void i9xx_write_infoframe(struct drm_encoder *encoder, else return; - val &= ~VIDEO_DIP_SELECT_MASK; + val &= ~(VIDEO_DIP_SELECT_MASK | 0xf); /* clear DIP data offset */ val |= intel_infoframe_index(frame); val |= VIDEO_DIP_ENABLE;